From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 06:57:21 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7cb9e4b1d146064cee0fd9ebaddf094a05819670;p=emacs.git

merge from trunk
---

7cb9e4b1d146064cee0fd9ebaddf094a05819670